Correctly export xencons functions to avoid ugly 'extern'

declarations.

Signed-off-by: Vincent Hanquez <vincent@xensource.com>

diff --git a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
index 81f0f10c21de0b62edac562c2b1b87d88988a451..b403d1e00472ae712e4f3a794aa4ef065fbabb56 100644 (file)
--- a/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
+++ b/linux-2.6-xen-sparse/arch/xen/kernel/reboot.c
@@ -15,6 +15,7 @@
 #include <asm-xen/xenbus.h>
 #include <linux/cpu.h>
 #include <linux/kthread.h>
+#include <asm-xen/xencons.h>
 
 #define SHUTDOWN_INVALID  -1
 #define SHUTDOWN_POWEROFF  0
@@ -29,7 +30,6 @@
 void machine_restart(char * __unused)
 {
        /* We really want to get pending console data out before we die. */
-       extern void xencons_force_flush(void);
        xencons_force_flush();
        HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_reboot);
 }
@@ -42,7 +42,6 @@ void machine_halt(void)
 void machine_power_off(void)
 {
        /* We really want to get pending console data out before we die. */
-       extern void xencons_force_flush(void);
        xencons_force_flush();
        HYPERVISOR_sched_op(SCHEDOP_shutdown, SHUTDOWN_poweroff);
 }
@@ -85,8 +84,6 @@ static int __do_suspend(void *ignore)
        int vcpu_prepare(int vcpu);
 #endif
 
-       extern void xencons_resume(void);
-
        int err = 0;
 
        BUG_ON(smp_processor_id() != 0);

diff --git a/linux-2.6-xen-sparse/drivers/xen/console/console.c b/linux-2.6-xen-sparse/drivers/xen/console/console.c
index fe18653ddeff22572375cfd30b5d13f8f1f32e0c..a9f72453a67a3660acdc88dc4f6f1c8779a67e04 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/console/console.c
+++ b/linux-2.6-xen-sparse/drivers/xen/console/console.c
@@ -53,6 +53,7 @@
 #include <asm-xen/xen-public/event_channel.h>
 #include <asm/hypervisor.h>
 #include <asm-xen/evtchn.h>
+#include <asm-xen/xencons.h>
 
 #include "xencons_ring.h"
 /*

diff --git a/linux-2.6-xen-sparse/include/asm-xen/xencons.h b/linux-2.6-xen-sparse/include/asm-xen/xencons.h
new file mode 100644 (file)
index 0000000..4b4909b
--- /dev/null
+++ b/linux-2.6-xen-sparse/include/asm-xen/xencons.h
@@ -0,0 +1,7 @@
+#ifndef __ASM_XENCONS_H__
+#define __ASM_XENCONS_H__
+
+void xencons_force_flush(void);
+void xencons_resume(void);
+
+#endif /* __ASM_XENCONS_H__ */